Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix config for uploads when data server is not exposed #936

Merged
merged 3 commits into from
Jul 6, 2020

Conversation

ishank011
Copy link
Contributor

@ishank011 ishank011 commented Jul 3, 2020

For the standalone config, expose_data_server is set to false by default, while the datagateway wasn't previously started. This PR starts the datagateway HTTP service at a different prefix than the dataprovider service, and makes it work for both TUS and non-TUS uploads. Closes #844, closes #931

@ishank011 ishank011 requested a review from labkode as a code owner July 3, 2020 17:50
@ishank011
Copy link
Contributor Author

@refs @butonic can you please review if you get the time? @labkode is on leave today, and we're starting with OCM testing so I wanted to get this in before that. Thanks a lot!

@ishank011 ishank011 merged commit 9d637a6 into cs3org:master Jul 6, 2020
@PVince81
Copy link
Contributor

PVince81 commented Jul 9, 2020

did you merge by mistake ? seems a review was missing

not sure if related, but apparently the uploads do not work any more in ocis-reva after updating: owncloud/ocis-reva#362

@ishank011
Copy link
Contributor Author

@PVince81 We wanted to get started with OCM testing that day, so I merged it. This just changes the default prefix for the datagateway service to datagateway (it was data previously). Since by default, we start only one HTTP server, having the same prefix for datagateway and dataprovider doesn't work. Other than that, in case these are not provided in the config, we try to get the reva hostname and use that for these URLs before defaulting to localhost.

So these are just changes in the default config. The error might be because of this if you use the defaults.

@butonic
Copy link
Contributor

butonic commented Jul 9, 2020

yep, in ocis-reva we started them as separate services and were relying on the default settings. fixed with owncloud/ocis-reva#363

@ishank011
Copy link
Contributor Author

@butonic this was done to simplify the deployment for the partners. Sorry about that!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants